gdk: Protect against negative GDK_SCALE values

Using those should not happen.

diff --git a/gdk/win32/gdkdisplay-win32.c b/gdk/win32/gdkdisplay-win32.c
index 50d6fad09813fbc593a0a738a4c57d7b54c0f5a4..9834b69cc7dd70fb406bef8a26aa1e14afb0757f 100644 (file)
--- a/gdk/win32/gdkdisplay-win32.c
+++ b/gdk/win32/gdkdisplay-win32.c
@@ -912,7 +912,7 @@ gdk_win32_display_init (GdkWin32Display *display)
     {
       display->surface_scale = atol (scale_str);
 
-      if (display->surface_scale == 0)
+      if (display->surface_scale <= 0)
         display->surface_scale = 1;
 
       display->has_fixed_scale = TRUE;

diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c
index 4554c6ccd4dfbbbac10a2055238e898697d45e75..f83df090e8ba70fe929e3a614a0df23f7815c262 100644 (file)
--- a/gdk/x11/gdkscreen-x11.c
+++ b/gdk/x11/gdkscreen-x11.c
@@ -774,7 +774,7 @@ _gdk_x11_screen_new (GdkDisplay *display,
     {
       x11_screen->fixed_surface_scale = TRUE;
       x11_screen->surface_scale = atol (scale_str);
-      if (x11_screen->surface_scale == 0)
+      if (x11_screen->surface_scale <= 0)
         x11_screen->surface_scale = 1;
     }
   else